Revert part to #5393
authorNick Cameron <ncameron@mozilla.com>
Thu, 3 May 2018 08:23:49 +0000 (20:23 +1200)
committerNick Cameron <ncameron@mozilla.com>
Thu, 3 May 2018 08:23:49 +0000 (20:23 +1200)
commit695bc5e488fb20fa6053c0ef00602f7701988323
tree65e046885afa85335ecab0aee36efce9c58251c7
parent6cd841fe4a55d21d8f9a74102e86acb9475d45da
Revert part to #5393

Commit 0b530c30867da26a4b59146f490c9f1d5377c20a (which this commit mostly reverts) did some refactoring around the `target_dir` function. However, it introduced a bug because it meant that where `CARGO_TARGET_DIR` was specified but `--target-dir` was not, the value from `CARGO_TARGET_DIR` was ignored.
src/cargo/core/workspace.rs
src/cargo/ops/cargo_install.rs
src/cargo/util/config.rs